bitkeeper revision 1.1159.258.145 (428e3757uj8_oSifvxuenpTuUY0rrg)

Fix Linux 2.4 build.

diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/common.h b/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/common.h
index 122fef8247094222d7079c583a44da7b80df8c45..88c27238a77cc3e506921cea558d09805b589139 100644 (file)
--- a/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/common.h
+++ b/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/common.h
@@ -24,6 +24,20 @@
 #include <asm/uaccess.h>
 #include <asm-xen/xen-public/io/blkif.h>
 
+#if 1
+#define IPRINTK(fmt, args...) \
+    printk(KERN_INFO "xen_blk: " fmt, ##args)
+#else
+#define IPRINTK(fmt, args...) ((void)0)
+#endif
+
+#if 1
+#define WPRINTK(fmt, args...) \
+    printk(KERN_WARNING "xen_blk: " fmt, ##args)
+#else
+#define WPRINTK(fmt, args...) ((void)0)
+#endif
+
 #if 0
 #define DPRINTK(_f, _a...) printk ( KERN_ALERT _f , ## _a )
 #else

diff --git a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h
index 7f46506285e2221fa7a089f1d2c00e3d5dc3104a..1a7eaf8f606a653fa7aaee7bf5c10045f9236720 100644 (file)
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h
@@ -50,11 +50,20 @@
 #include <asm/atomic.h>
 #include <asm/uaccess.h>
 
+#if 1 
 #define IPRINTK(fmt, args...) \
     printk(KERN_INFO "xen_blk: " fmt, ##args)
+#else
+#define IPRINTK(fmt, args...) ((void)0)
+#endif
+
+#if 1 
 #define WPRINTK(fmt, args...) \
     printk(KERN_WARNING "xen_blk: " fmt, ##args)
-
+#else
+#define WPRINTK(fmt, args...) ((void)0)
+#endif
+ 
 #if 0
 #define DPRINTK(_f, _a...) printk ( KERN_ALERT _f , ## _a )
 #else